Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Jul 2010 23:02:59 +0000 (23:02 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Jul 2010 23:02:59 +0000 (23:02 +0000)

Trivial merge